Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Tue, 13 Nov 2012 14:17:18 +0000 (16:17 +0200)
committerEli Zaretskii <eliz@gnu.org>
Tue, 13 Nov 2012 14:17:18 +0000 (16:17 +0200)
commitcb6be1f40158628e4ab2ec71519a5ec855bf66f4
tree89437793e138791890faf9bbebf236a074812c54
parent398de2f9286a51db8163d12fca8600e33c38b638
parent6feaf9de35d017a90d1d35f936c0043dda32b6ca
Merge from trunk.
12 files changed:
lisp/ChangeLog
lisp/subr.el
src/ChangeLog
src/emacs.c
src/keyboard.c
src/lisp.h
src/makefile.w32-in
src/termhooks.h
src/w32fns.c
src/w32proc.c
src/w32term.c
src/w32term.h